From e3683d26f5d037c67bcc9a9ca4ce5644fe77f339 Mon Sep 17 00:00:00 2001 From: "vh249@arcadians.cl.cam.ac.uk" Date: Sat, 10 Sep 2005 14:43:46 +0000 Subject: [PATCH] fix ballooning out logic to handle dying domain freeing memory. Signed-off-by: Vincent Hanquez --- tools/python/xen/xm/create.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 4f67005bc4..6fdfedd3a3 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -772,30 +772,33 @@ def balloon_out(dom0_min_mem, opts): """Balloon out memory from dom0 if necessary""" SLACK = 4 timeout = 20 # 2s - ret = 0 + ret = 1 xc = xen.lowlevel.xc.new() - pinfo = xc.physinfo() - free_mem = pinfo['free_pages'] / 256 + free_mem = xc.physinfo()['free_pages'] / 256 domU_need_mem = opts.vals.memory + SLACK + # we already have enough free memory, return success + if free_mem >= domU_need_mem: + del xc + return 0 + dom0_cur_alloc = get_dom0_alloc() dom0_new_alloc = dom0_cur_alloc - (domU_need_mem - free_mem) + if dom0_new_alloc < dom0_min_mem: + dom0_new_alloc = dom0_min_mem - if free_mem < domU_need_mem and dom0_new_alloc < dom0_min_mem: - ret = 1 - if free_mem < domU_need_mem and ret == 0: + server.xend_domain_mem_target_set(0, dom0_new_alloc) - server.xend_domain_mem_target_set(0, dom0_new_alloc) + while timeout > 0: + time.sleep(0.1) # sleep 100ms + + free_mem = xc.physinfo()['free_pages'] / 256 + if free_mem >= domU_need_mem: + ret = 0 + break + timeout -= 1 - while dom0_cur_alloc > dom0_new_alloc and timeout > 0: - time.sleep(0.1) # sleep 100ms - dom0_cur_alloc = get_dom0_alloc() - timeout -= 1 - - if dom0_cur_alloc > dom0_new_alloc: - ret = 1 - del xc return ret -- 2.30.2